The thought occurred to me as well. Do you want it in this PR or is that comment intended for another eventual cleanup?