I'm not at all opposed to leaving the old functions where they are, they are simple inlined redirects, and in many cases still make sense where they were. I vote we leave them in.