Silence printf format warnings.
Merge upstream patch to silence spurious "no such identity file" warnings.
Fix comment formatting.