make macros non-capturing
push through added arg to ExplicitSelf_ variants
update for extra field