Use normal methods instead of helpers in the IR

CI for now.