ruiu added a comment. I intentionally avoided renaming variables to make this a mechanical change. I'll rename variables later, but I don't want to do that in this patch. https://reviews.llvm.org/D39459