make the error less shit
Merge branch 'paultag/bugfix/macro-errors' into paultag/bugfix/yield-let