Minor TP tidy up.