Indexing the argument values.
Merge branch 'refactoringbuildindex' into avherald