Improve code as suggested in D123005. Applied separately, because the comments where made a diff that has not been rebased to current main.
