EZP-21804: removed unnecessary temporary variables