This stuff got mostly already manually freed but I think this change makes it a little easier to see who owns what.