I tried really hard to fix this, but frankly it kicked my ass. Whatever I do to fix this one results in failures elsewhere. And there doesn’t seem to be a good place. In general, the feeling I get from working with this code is that typing of enums in HQL works more by accident than by design, and that we need to do some more thinking about this issue.