Made some efficiencies in the starting points resolver.