Split out "E721" fixer