[ref_impl_eiffel] [1628] Minor additional refactoring prior to addition of RM viewing tool.

Revision: 1628
Author: thomas.beale
Log Message: