junbuml added a comment. Took a quick look at this change. Look like you need to run clang-format, other than that I didn't see any issue with it. Let me take another look next week. I believe it make this pass even better shape. https://reviews.llvm.org/D40728