row: Some tweaking for performance

Change-Id: Ieac2aa66716333bdf054b8f28361d035dbf7e860