Fixing macro usage

Hi Alex,

I optimized your new link helper a little bit. 

Although the new link helper seems to introduce a macro error, which should be fixed by this pull request.

Best regards,
Daniel