[ref_impl_eiffel] [1355] Correct various bugs to do with starting fresh, i.e.

Revision: 1355
Author: thomas.beale
Log Message: