You can copy the new implementation of Concat() and ConcatPair() into your code, and use it instead of builtin version:
Concat()
ConcatPair()