Minor mods for g++ vs. clang++