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