Simplify & fix `Client_main.with_connection'`
Rework `Client_main.with_connection'`