Fix XTRE0540 warnings due to ambiguous template match