Fixed things so we can refer to enum values by name.