Support LLVM trunk, and full backtrace line info

Fix disassembly line numbers
Properly initialize some variables.
Clean up merge cruft and make ';' mangling MCJIT-only