[ref_impl_eiffel] [710] Slight refactoring of validation logic to improve maintainability.

Revision: 710
Author: thomas.beale

Log Message: