Enums part deux...

Missed some commits, strangely. Now we are whole again.