Small grammar improvements