In hindsight, I like your solution more, so I've gone ahead and merged. Thanks for humouring me @ajdawson :smile: