vapi: Some more scope=async updates

In addition to 3e20fd82c05daa60005aaff11411cd1814beb778