refactor resolve-scope into its own pass
Merge branch 'new-world' into new-id