improved handling of quantified ints and keywords