GUVNOR-2122: Fix support for null and not-null operators; together with fixes for Enums.