Enum cleanup/renaming.
Missed retain.
Still more unit tests.