-#undef stack_base
-#undef stack_sp
-#undef stack_max
-#undef curstack
-#undef mainstack
-#undef markstack
-#undef markstack_ptr
-#undef markstack_max
-#undef scopestack
-#undef scopestack_ix
-#undef scopestack_max
-#undef savestack
-#undef savestack_ix
-#undef savestack_max
-#undef retstack
-#undef retstack_ix
-#undef retstack_max
-#undef curcop
-#undef cxstack
-#undef cxstack_ix
-#undef cxstack_max
-#undef defstash
-#undef curstash
-#undef tmps_stack
-#undef tmps_floor
-#undef tmps_ix
-#undef tmps_max
-#undef curpad
-#undef Sv
-#undef Xpv
-#undef statbuf
-#undef timesbuf
-#undef top_env
-#undef runlevel
-#undef in_eval
-#undef restartop
-#undef delaymagic
-#undef dirty
-#undef localizing
-
-#define self (thr->Tself)
-#define oursv (thr->Toursv)
-#define stack_base (thr->Tstack_base)
-#define stack_sp (thr->Tstack_sp)
-#define stack_max (thr->Tstack_max)
-#ifdef OP_IN_REGISTER
-#define opsave (thr->Topsave)
-#else
-#undef op
-#define op (thr->Top)
-#endif
-#define curcop (thr->Tcurcop)
-#define stack (thr->Tstack)
-#define curstack (thr->Tcurstack)
-#define mainstack (thr->Tmainstack)
-#define markstack (thr->Tmarkstack)
-#define markstack_ptr (thr->Tmarkstack_ptr)
-#define markstack_max (thr->Tmarkstack_max)
-#define scopestack (thr->Tscopestack)
-#define scopestack_ix (thr->Tscopestack_ix)
-#define scopestack_max (thr->Tscopestack_max)
-
-#define savestack (thr->Tsavestack)
-#define savestack_ix (thr->Tsavestack_ix)
-#define savestack_max (thr->Tsavestack_max)
-
-#define retstack (thr->Tretstack)
-#define retstack_ix (thr->Tretstack_ix)
-#define retstack_max (thr->Tretstack_max)
-
-#define cxstack (thr->Tcxstack)
-#define cxstack_ix (thr->Tcxstack_ix)
-#define cxstack_max (thr->Tcxstack_max)
-
-#define curpad (thr->Tcurpad)
-#define Sv (thr->TSv)
-#define Xpv (thr->TXpv)
-#define statbuf (thr->Tstatbuf)
-#define timesbuf (thr->Ttimesbuf)
-#define defstash (thr->Tdefstash)
-#define curstash (thr->Tcurstash)
-
-#define tmps_stack (thr->Ttmps_stack)
-#define tmps_ix (thr->Ttmps_ix)
-#define tmps_floor (thr->Ttmps_floor)
-#define tmps_max (thr->Ttmps_max)
-
-#define in_eval (thr->Tin_eval)
-#define restartop (thr->Trestartop)
-#define delaymagic (thr->Tdelaymagic)
-#define dirty (thr->Tdirty)
-#define localizing (thr->Tlocalizing)
-
-#define top_env (thr->Ttop_env)
-#define runlevel (thr->Trunlevel)
-
-#define cvcache (thr->Tcvcache)