Update existing references to deprecated methods to point to new members

Also did some performance tweaking, and in some cases, cut out large
chunks simply for the sake of clarity, nothing more.