Track-adder cleanups.