Move member variable up to where the rest of non-DWARF5 variables reside.