Merge "conman:  Minor cleanup."