Minor clean-up of the index module.
Get rid of the unnecessary notion of hierarchy!
Bundle an updated version of clang.