Better support for "n't" and "'ll"