Simplify multiple config handling.

Use conventional pattern of not repeating the loop body for empty
config.
Merge topic 'simplify-multi-config' into next

936e00b9 Simplify multiple config handling.