Update row factory to correctly handle collapsed agg rows.