diff --git a/language/common_res.h b/language/common_res.h
index 76154b538..dd410e846 100644
--- a/language/common_res.h
+++ b/language/common_res.h
@@ -561,25 +561,24 @@
 #define IDS_MUI_LANG_EL_GR              34505
 #define IDS_MUI_LANG_EN_GB              34506
 #define IDS_MUI_LANG_ES_ES              34507
-#define IDS_MUI_LANG_ES_MX              34508
-#define IDS_MUI_LANG_FR_FR              34509
-#define IDS_MUI_LANG_HI_IN              34510
-#define IDS_MUI_LANG_HU_HU              34511
-#define IDS_MUI_LANG_ID_ID              34512
-#define IDS_MUI_LANG_IT_IT              34513
-#define IDS_MUI_LANG_JP_JP              34514
-#define IDS_MUI_LANG_KO_KR              34515
-#define IDS_MUI_LANG_NL_NL              34516
-#define IDS_MUI_LANG_PL_PL              34517
-#define IDS_MUI_LANG_PT_BR              34518
-#define IDS_MUI_LANG_PT_PT              34519
-#define IDS_MUI_LANG_RU_RU              34520
-#define IDS_MUI_LANG_SK_SK              34521
-#define IDS_MUI_LANG_SV_SE              34522
-#define IDS_MUI_LANG_TR_TR              34523
-#define IDS_MUI_LANG_VI_VN              34524
-#define IDS_MUI_LANG_ZH_CN              34525
-#define IDS_MUI_LANG_ZH_TW              34526
+#define IDS_MUI_LANG_FR_FR              34508
+#define IDS_MUI_LANG_HI_IN              34509
+#define IDS_MUI_LANG_HU_HU              34510
+#define IDS_MUI_LANG_ID_ID              34511
+#define IDS_MUI_LANG_IT_IT              34512
+#define IDS_MUI_LANG_JP_JP              34513
+#define IDS_MUI_LANG_KO_KR              34514
+#define IDS_MUI_LANG_NL_NL              34515
+#define IDS_MUI_LANG_PL_PL              34516
+#define IDS_MUI_LANG_PT_BR              34517
+#define IDS_MUI_LANG_PT_PT              34518
+#define IDS_MUI_LANG_RU_RU              34519
+#define IDS_MUI_LANG_SK_SK              34520
+#define IDS_MUI_LANG_SV_SE              34521
+#define IDS_MUI_LANG_TR_TR              34522
+#define IDS_MUI_LANG_VI_VN              34523
+#define IDS_MUI_LANG_ZH_CN              34524
+#define IDS_MUI_LANG_ZH_TW              34525
 #define IDS_USE_LOCALE_DATEFMT          34700
 
 #define IDS_MUI_MENU_THEMES             37000
diff --git a/src/MuiLanguage.c b/src/MuiLanguage.c
index 00ab3bff0..e5083cdfa 100644
--- a/src/MuiLanguage.c
+++ b/src/MuiLanguage.c
@@ -63,7 +63,6 @@ grepWinLng_t grepWinLangResName[] = {
     { L"el-GR",  L".\\lng\\gwLng\\Ελληνικά (Ελλάδα) [el-GR].lang" },
     { L"en-GB",  L".\\lng\\gwLng\\English (United Kingdom) [en-GB].lang" },
     { L"es-ES",  L".\\lng\\gwLng\\Español (España) [es-ES].lang" },
-    { L"es-MX",  L".\\lng\\gwLng\\Español Mexicano (Mexico) [es-MX].lang" },
     { L"fr-FR",  L".\\lng\\gwLng\\Français (France) [fr-FR].lang" },
     { L"hi-IN",  L".\\lng\\gwLng\\हिन्दी (भारत) [hi-IN].lang" },
     { L"hu-HU",  L".\\lng\\gwLng\\Magyar (Magyarország) [hu-HU].lang" },
@@ -216,14 +215,13 @@ MUILANGUAGE MUI_LanguageDLLs[] = {
     { IDS_MUI_LANG_EL_GR,  L"el-GR",   L"Ελληνικά (Ελλάδα)\t\t\t[%s]",             false, false },
     { IDS_MUI_LANG_EN_GB,  L"en-GB",   L"English (United Kingdom)\t\t\t[%s]",      false, false },
     { IDS_MUI_LANG_ES_ES,  L"es-ES",   L"Español (España)\t\t\t[%s]",              false, false },
-    { IDS_MUI_LANG_ES_MX,  L"es-MX",   L"Español Mexicano (Mexico)\t\t\t[%s]",      false, false },
     { IDS_MUI_LANG_FR_FR,  L"fr-FR",   L"Français (France)\t\t\t[%s]",             false, false },
     { IDS_MUI_LANG_HI_IN,  L"hi-IN",   L"हिन्दी (भारत)\t\t\t[%s]",                    false, false },
     { IDS_MUI_LANG_HU_HU,  L"hu-HU",   L"Magyar (Magyarország)\t\t\t[%s]",         false, false },
     { IDS_MUI_LANG_ID_ID,  L"id-ID",   L"Bahasa Indonesia (Indonesia)\t\t\t[%s]",  false, false },
     { IDS_MUI_LANG_IT_IT,  L"it-IT",   L"Italiano (Italia)\t\t\t[%s]",             false, false },
-    { IDS_MUI_LANG_JP_JP,  L"ja-JP",   L"日本語 (日本)\t\t\t[%s]",                  false, false },
-    { IDS_MUI_LANG_KO_KR,  L"ko-KR",   L"한국어 (대한민국)\t\t\t[%s]",              false, false },
+    { IDS_MUI_LANG_JP_JP,  L"ja-JP",   L"日本語 (日本)\t\t\t[%s]",                   false, false },
+    { IDS_MUI_LANG_KO_KR,  L"ko-KR",   L"한국어 (대한민국)\t\t\t[%s]",                false, false },
     { IDS_MUI_LANG_NL_NL,  L"nl-NL",   L"Nederlands (Nederland)\t\t\t[%s]",        false, false },
     { IDS_MUI_LANG_PL_PL,  L"pl-PL",   L"Polski (Polska)\t\t\t[%s]",               false, false },
     { IDS_MUI_LANG_PT_BR,  L"pt-BR",   L"Português Brasileiro (Brasil)\t\t\t[%s]", false, false },
@@ -233,8 +231,8 @@ MUILANGUAGE MUI_LanguageDLLs[] = {
     { IDS_MUI_LANG_SV_SE,  L"sv-SE",   L"Svenska (Sverige)\t\t\t[%s]",             false, false },
     { IDS_MUI_LANG_TR_TR,  L"tr-TR",   L"Türkçe (Türkiye)\t\t\t[%s]",              false, false },
     { IDS_MUI_LANG_VI_VN,  L"vi-VN",   L"Tiếng Việt (Việt Nam)\t\t\t[%s]",         false, false },
-    { IDS_MUI_LANG_ZH_CN,  L"zh-CN",   L"简体中文 (中国大陆)\t\t\t[%s]",                false, false },
-    { IDS_MUI_LANG_ZH_TW,  L"zh-TW",   L"正體中文 (中國台灣)\t\t\t[%s]",                false, false }
+    { IDS_MUI_LANG_ZH_CN,  L"zh-CN",   L"简体中文 (中国大陆)\t\t\t[%s]",              false, false },
+    { IDS_MUI_LANG_ZH_TW,  L"zh-TW",   L"正體中文 (中國台灣)\t\t\t[%s]",              false, false }
 };
 
 //NUM_OF_MUI_LANGUAGES
diff --git a/src/Notepad3.c b/src/Notepad3.c
index 77bd4953c..3f84787a5 100644
--- a/src/Notepad3.c
+++ b/src/Notepad3.c
@@ -683,8 +683,10 @@ static inline void ResetFileObservationData(const bool bResetEvt) {
 
 void TinyExprToStringA(LPSTR pszDest, size_t cchDest, const double dExprEval)
 {
-    double intpart = 0.0;
-    if ((fabs(modf(dExprEval, &intpart)) < TE_ZERO) && (fabs(intpart) < 1.0E+21)) {
+    double idbl = 0.0;
+    double const fracpart = fabs(modf(dExprEval, &idbl));
+    double const intpart = fabs(idbl);
+    if ((fracpart < TE_ZERO) && (intpart < 1.0E+21)) {
         StringCchPrintfA(pszDest, cchDest, "%.21G", intpart); // integer full number display
     }
     else {
@@ -695,8 +697,10 @@ void TinyExprToStringA(LPSTR pszDest, size_t cchDest, const double dExprEval)
 
 void TinyExprToString(LPWSTR pszDest, size_t cchDest, const double dExprEval)
 {
-    double intpart = 0.0;
-    if ((fabs(modf(dExprEval, &intpart)) < TE_ZERO) && (fabs(intpart) < 1.0E+21)) {
+    double       idbl = 0.0;
+    double const fracpart = fabs(modf(dExprEval, &idbl));
+    double const intpart = fabs(idbl);
+    if ((fracpart < TE_ZERO) && (intpart < 1.0E+21)) {
         StringCchPrintf(pszDest, cchDest, L"%.21G", intpart); // integer full number display
     }
     else {