Fix MMP-1269.  Make parmeters which should be enums enums.