Yeah, this is probably a good idea.  I'll amend the PR in the next day or so.