Resolve should not have been binding $self. This is now done in lookup.