Migrate callers to waitForReplication()