Enum processing, improved comment removal