Remove more deprecation warnings.