Fixes to make clang upstream happy.