Followup to 55f76b: only checksum when asked.