HQLPARSER-17 Incorporating feedback from review