[Broken] Fix matchArguments logic to be more specific.
Fix matchArguments for additional cases.