mjw/dwarf_output branch