The NOT and the UNTIL with numbers fix as a separate branch.

Contains the fix to negations, NOTS, and the UNTIL statement in a separate pull request.