Cosmetic cleanups for the language definitions