[ref_impl_eiffel] [1671] Refactoring changes:

Revision: 1671
Author: thomas.beale
Log Message: