Follow-up EZP-21820 & EZP-22174: further simplifications

Links: https://jira.ez.no/browse/EZP-21820 & https://jira.ez.no/browse/EZP-22174