Correcting handling of resolver arguments for the case where there might be more than just 2 (e.g. a progress callback might be passed to the resolver)