A small refactor to scoping code

- add comments headers
- factor out Scope.pass_unscoped()
Update TODO