A couple more changes to get RowRef to work.