Grammar fixups.