Changed scoped lookup to happen through callbacks.
Self-review.