Plug a few memory leaks

&hellip;and fix indent along the way.

r? @JoesCat