Changed handling of AGI argument passing