Some minor refactorings in Checksum::ES