Revert r56044 (which changed the %c format specifier to accept a

unicode char into an int variable) and add %C which does this.