Fixed many deprecation warnings.  Don't value consistency by itself!  If something is depercated, don't copy it into new code, instead, make new code use the non-deprecated version, and fix the old code when you have time.  Consistency is a means, not an end.