This seems to do the right thing but haven't looked at how it interacts
with DWARF yet. I imagine the information is still wrong there.