Fix #362, plus small tweaks to localization code namespace