r18233: Use the autogenerated cli_unixinfo rather than the old one.