Arbitrary length xlat support in v3.1.x