Various random memory leaks I've found and a couple of cleanups, using parts of !34 (merged) when it made sense.