GUVNOR-2122: Fix support for Enums.