Resolve field references correctly.