[SRE] Refactor a few icalls