Move the addition of the dwo_id as late as possible after everything
has been finalized except for sizes and offsets. Update test accordingly.
Fix warning about unused member.