The new implementation contains less duplicated code and
is easier to extend.

This commit is best viewed with 'git show -w'.
Signed-off-by: NAndrea Bolognani <abologna@redhat.com>