Moved completion behavior from envelope to client.