[ref_impl_eiffel] [1231] Various changes due to bugs uncovered by regression testing...

Revision: 1231
Author: thomas.beale
Log Message: