fixup llvm-eval and such