Re: Merged "sane" commits from mjw/dwarf_output to dwarf branch