Abuse scope more in one place, and much less everywhere else