Minor clang compatibility changes.