Improve zemcontact.deliver callback signalling