Simplify clientIdGenerator implementation.