More cosmetic printf changes