TDB2: more internal cleanups after TDB1 compatibility removal.