Replace complicated single row with simpler two rows.