improvements to argument matching in builtin invocation