Added another smart name removal pass before disambiguation.