More grammar cleanups.