Initial work on fixing the translation generator...  Serious PITA...