Some cleanups in clientextras.mm