Remove more uses of 'index' as namespace scope.

Follow up to r188850.