Reshuffle the declarations