Cleaned up I18N files.

Other minor cleanups.