More cleanup to remove re-resolution.