Yep, just a thought I had while reading.  I'd be fine with this coming in a later pull request.