[ref_impl_eiffel] [1147] Various clean-up refactoring, no semantic changes.

Revision: 1147
Author: thomas.beale
Log Message: