Move various deprecations along.

I'm may have missing some that didn't end up with the exact comments that I grep for, but I did manage to catch several that had been missing those comments.