Fixes a regression when a mixin guard can't see the mixin parameter variables in certain cases.
Merge pull request #2002 from seven-phases-max/fix-2001

Fixes #2001