Refactor with initial integration of scope / symbol API.