CORE-5918: finished adding support for enumerated types