Remember correct rowIndex per variant. Refs #67.
Update TODO.
Fix arrow type.