Added some more deprecation comments.