Slightly refactor things for llvm-objdump and the -macho option so it can be used...