Add more use of psprintf()