I had to remove this early-exit optimization for now.  I doubt it has any discernible impact, but if I'm wrong we can reintroduce it once pull #3117 lands.