Expression system: added explicit support for enums