More work on #827: restricting to OP_CALL and adding adjoint case