xlat: cleanup the aftermath of automatic conversion
5 files changed