Cosmetics for COMETD-481 (Advice "multiple-clients" may be generated due to race condition).