cmdline (merge-intel): cosmetic fixes, conform to coding rules