Cleaner build fix for pedantic LLVM Clang issue -