[ref_impl_eiffel] [918] Continued refactoring

Revision: 918
Author: thomas.beale
Log Message: