@witty-crayon-22786 I'm going to send you a PR which I don't think you're going to like, but where I'm not convinced there is a particularly nice way of doing what I'm doing, so I've chosen an efficient ugly way over a more functional ugly way... If you see any obvious improvements, I will very happily implement them...