and flatten it, to make it easier to read and reason about

Change-Id: I5032472f26c9695ce719d905d20472b18356f017
Reviewed-on: https://gerrit.libreoffice.org/59539
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>