More reconcile-visit bug squashing.