@jferris Good idea. Done in 70c3cb2. Ready for re-review.