Move line number into #mac{} instead of as argument
Move line number into #mac{} instead of as argument

This makes it much easier to pass around at all levels.

lfe/lfe,rvirding/lfe,jjhoo/lfe,rvirding/lfe,jjhoo/lfe,lfe/lfe