Changes to get clang builds working + other cleanups.