Fixed deprecated methods.

Note that this bumps minimum target to 6.0, and also requires the creation of a 2.4.6 tag.