>
> Looks good to me (adjusting for comments from others), so feel free to 
> push when you're satisfied with the patch.
>

Done.

>
> I wonder whether this could be a two part thing?
>

It could! 😃