Pekka Paalanen authored Jun 13, 2022 and Pekka Paalanen committed Jun 16, 2022

Make use of the shared code instead of open-coding everywhere. This
should make the code easier to read, and reduce the chance of typos if
changes are needed in the future.

No change in behaviour.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>