Generalize scoping.  This fixes #603
4 files changed