Modifications to accomodate structure types in dwarf.wq