Replace use of old output functions with the new ones.