Hrmm. It is a good suggestion, but I'm a little torn about whether it is something that ought to be addressed in this PR. I'll add it in, but it does feel a little like PR scope creep :)