@starfennec @Vivaldi Thanks for this.
I took a quick look at it and it does the 2 things I'm after, plus a few more. I'll take a closer look this afternoon to see what's what with it.