Support for "positional options" and another batch of conversions (#41651)

To make review more sensible, I split out the reordering into separate
commits when there was a lot of reordering.

diff --cc src/nspawn/nspawn.c
Simple merge

diff --cc src/vmspawn/vmspawn.c
Simple merge