epdtry make ExpandStructRegs more robust