Remove some uses of newtype enum