Yeah, that crossed my mind too, but I left it out in order to simplify the PR.  But since you're on board, I'll add it back in.