A variety of fixes found in pursuit of a clean clang/libc++/Mavericks compile