Split a too long function up in smaller bits to make
prgram logic easier to follow.
A few related changes done due to parameter
changes.

No functional changes.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>