Skip per-value lookups where less efficient than per-row.
Merge branch 'master' of git://github.com/flavour/eden