Macro: subst bugfix and some clarifications