Consistent typing of indexes

Change-Id: Id2d8249efe8c81740c7c1f4448ed76699f1aae15