Code review: minor changes to mpclient