[ref_impl_eiffel] [325] Cleaner version of work done in previous commit.

Revision: 325
Author: thomas.beale

Log Message: