Modernize the code by using the clever formatter rather than checking
manually when to format the end of the element.
Signed-off-by: NPeter Krempa <pkrempa@redhat.com>