Simplified some of the boolean tests in the StoreCollector.