Improved argument matching