Fix breakage. Less platform specific dwarf stuff.