Close to using scopes the way I need to inside builder and debugger.
More work to save scope information. Add scope number to each basic block.