Fix broken logic for resolving arguments using the API key (rather than the natural key)