x0: code cleanup, no shadow var
x0: code cleanup, no shadow var

Former-commit-id: 950a4cad514d3a3e475dd6bc85463f46763ae8a3
Former-commit-id: 6dd93c3b25adbfc133fb81d05b998863f8897ed9
torhve/ivar2,torhve/ivar2,torhve/ivar2,haste/ivar2