Merge in differences from the resolver's version.