Swap out more OPENSTUDIO_ENUM with generated code