ruiu added a comment. I don't have a strong preference, but as you already split the file and fixed the variable names, I'm fine if you check in both changes as one change. https://reviews.llvm.org/D32890