More printf cleanup.