TaxCollector logic improved.