Move around a method and fix a leak.