Misc cleanup of checksum support