beanz accepted this revision. beanz added a comment. This revision is now accepted and ready to land. This looks like a nice improvement. There are some formatting inconsistencies, can you run clang-format? https://reviews.llvm.org/D32600