0.6.2: More simplification in Client::Base