Update feature #590: Better i18n init and cleanup