We appear to mostly be using push_scope in tests. These usages should be removed, unless the test primarily exists to verify that push_scope continues to work even after being deprecated.