More attempts to fix for the ultra-pedantic clang compiler.