Thank you both for looking at the patch and the feedback!

I've put these suggestions into this new version.