Streamline scope deprecation warnings a bit