Small grammar improvement