Done.  I've pushed updates, ready for another review.  Thanks!