Debug info structured more neatly