Minor code rearrangement.

    Should not affect functionality.