Added `@type` inside macros that refer to the current type (so we remove all other magic instance vars and only keep that one)