Minor indexing fix.
Merge branch 'prototype-lintool-indexing' into prototype-lintool
Minor tweaks.