Merge pull request #1481 from antonio-nino-diaz-arm/an/xlat-refactor

xlat: More refactoring