Use proper enum types in proposal_substructure.