This is irrelevant to this PR. I just grabbed the opportunity to do a minor cleanup as I was tracing the code.