better argument name finding logic