More printf fixes stemming from format string change in r1882.