generator: avoid blanks line in output units, don't store 2 diff things in job{'d'}, be more conservative about command line de-mangling