[ref_impl_eiffel] [1505] Further refactoring.

Revision: 1505
Author: thomas.beale
Log Message: