Rework of par-cmdline-contents.diff