Add support for enum types in ckit amalgamation.
Clean up test.