Refactor scope map helper to use abbreviated syntax.

Resolves #368