Grammar cleanups and the like