cosmetics: Move around some rules and variable declarations.