vocabs.hierarchy: some cleanup and minor speedups.
vocabs.hierarchy: some cleanup and minor speedups.

mcandre/factor,mcandre/factor,mcandre/factor,mcandre/factor,mcandre/factor,mcandre/factor,mcandre/factor