afb-xreq: Fix bugs in subcalls