Tweaked spanning methods to require fewer queries