minor refactoring of the llvm/clang modules