Rearrange declarations to facilitate refactoring.

    The goal is to modify things so that locals are declared
    in registers by default, and don't always spill to stack.