By introducing a few extra functions, we can kill off a few extra members
of the enum. More work from Christoph Hellwig.