simplify and pass -mqtt to all NewClient() calls, see #444