built-in format-patch: various fixups.