tdb2: use expansion heuristics from tdb1