Cleanup a couple of leaky vars.