Bug 10380: (follow-up) update some uses of output_pref()