I have rewritten the core of the Query Validator to depend only on standard annotation processing APIs, and brought it into the Metamodel Generator. This means that queries specified using the @HQL annotation will be completely typechecked.