Reindexer, for #966
Minor: IntelliJ files