Various language cleanups