Mathewpeterson/add more deprecation

@dianakhuang @dmitchell @cpennington Review?
This should pass `deprecated` through.