Reshuffle to better match upstream
Match whitespace with upstream
Reshuffle to match upstream
Reshuffle to match upstream better (for comparisons)
Reshuffle to match upstream