Better name resolution, etc.