I like that idea a lot, but I'm hesitant to do it in this case, as this is a fix for the v4.1 release that is supposed to be cut today. I'd rather not introduce any uncertainty in the release in the name of making the code prettier. If it's ok with you, I'll just keep it in mind going forward for the next time my spidey sense is tingling about some gross code.