Fix trackstop ambiguity complaints, update df-structures.