- swept and replaced (int)e.RowKeyValue with e.RowKeyId for consistency