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