VE-1511 Simplify deferred callback