I have a second PR in the queue regarding this issue - I'll do it there.  Thanks for checking.