Minor quantifier improvements