Grammar cleanup.