Remove deprecation indirections

Given we're about to have a non-backwards compatible release as it is, we might as well remove these annoying links. Especially with the new refactoring that Ian did it is making it hard to ignore warnings. Down with it!