Remove commented prior expat code and fix amin_machine_spec declaration to move with new Eo .