Thanks for the code printing tip, I'll use that in future. It turns out that I was a bit hasty in my leak detection - It's actually something else which I'll post in a new node.