The old code performed array lookup twice; once for the cell type and twice
for the value fetch.  The new code does lookup only once.

Change-Id: Ic6f5927b5536a73cb0a5c00a6c3a12ff0cd1f1e0