Updated for stricter compiler warnings in latest llvm.