Update and simplify to match Clang r223095.