EZP-22105: clean up deprecated return hints