Alex, I changed this so stats are only maintained if statistics are configured.  I suspect that's what you wanted all along, but I wanted to call it out.