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

This reverts commit 5cedb357dfa26dd1c2b2fdf1f3698534208e1222.