A couple changes with the new token api went into QueryParser.java but not in QueryParser.jj. A fresh javacc would lead to compilation errors.