> Pushed one more commit to address the inconsistency I mentioned above.
> Please review.

Looks good. (Nice catch updating the perl script in contrib, btw; I would
definitely have missed that.)

Okay to commit.