some changes to tolerate the (partially dwarf4?) output from llvm/clang