[checkmk-commits] Extract more helper functions