Eliminate use of untested format strings