Rework the re-resolution after enter traces machinery with cleaner
separations and neater interfaces.