Towards working merge
Remove junk
Try adding these again
Much better
Simplify DWARFReader construction