[ref_impl_eiffel] [1610] Fixes:

Revision: 1610
Author: thomas.beale
Log Message: