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

Simplify the code by using ready-made helpers.

No change in behaviour.

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