To be fair to @cpelley that line of code has not been proposed to be changed - whilst I agree with what you'd change, I suggest those kind of changes should be done separately (and perhaps you're the best person to do them @iedwards).