More rearranging to attempt to get unit tests to compile for namespace global functions.