Parse enum value options and fix option map parsing

@swankjesse