Btw, I hadn't intended to suggest that you need to atomize the PR. I was initially trying to confirm my understanding of those lines of code and their purpose.