Quiet clang
Renamings
Cleaner code for indexes.