Further simplification of TT replace strategy

No functional change