Done.  Will update the PR as soon as I address the feedback below.