In the two queryDidFinishGathering: methods, reorder code to be consistent.