Migrates subcalls to use xreq