Squash a couple uses with deprecated method signatures and file locations.