After this patch, "(scope call)" annotations are correct.
There are still lots of "(scope async)" annotations that are wrong, including
the two introduced here.