Added kinds to some quantifier parser