I intend to go further with this, to eliminate all Tcount stuff.