And a few other similar small cleanups.

Change-Id: I91c992f33f2166d1cf27cbc9def1b69965040658
Reviewed-on: https://gerrit.libreoffice.org/39928Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>