Some code cleanup in WordIndexer.