2nd attempt at localized label mappings cleanup :-)