Move static function to inline function - this fixes a conceivable

ODR violation and a clang-tidy warning about an unused function
in a number of translation units.