Split out arrange_rows and arrange_columns. Try to make COPYING consistent.