Yes. That is exactly what I did: enclosed the offending functions within if-not-function_exists blocks. But I didn't bother with the 'v6' versions of the functions.
Thanks for the code example. Hopefully it will help others until this is resolved at the source.
Terry