Remove some soon-to-be-obsolete warnings.