Almost finished the switch to type-erased trajectories.