More changes to eliminate warnings from Apple clang.