Bug 874471 - Handle mach command help more robustly; r=ted