Cleanup local vars a bit more.