KNF
Minor code shuffling, makes both clang and lint happier.
Revert "Minor code shuffling, makes both clang and lint happier."

This reverts commit 5cedb357dfa26dd1c2b2fdf1f3698534208e1222.
Revert "Simplify cksum-init, avoid complaint about a macro that's never used."

This reverts commit 7f2f048673d26c39d669c1e68ee4b4a9ffca4d6b.