That's what I get for actually trying to free my memory :-)
Also tidy up some of the memory management, while I'm here.