Changed method matching to produce an argument map.