Can you move the QueryConstants.NO_SALTING constant as a private static here? I think this'll be the only place we need it.