Fixed a bug where numArgs (and general linking) wasn't being used.
Merge origin/master