[ref_impl_eiffel] [1860] Further fixes to make BMM demo compile

Revision: 1860
Author: thomas.beale
Log Message: