yr: cleanup
yr: cleanup

Former-commit-id: be4dfcf5d9a483282888260e99cfd60da176a40e [formerly 77169ffd7f9fc5018ee05150eaf3fef00269410d]
Former-commit-id: b39303ac4e7586e158cc3f0cd87f95d158e9725f
torhve/ivar2,torhve/ivar2,torhve/ivar2,haste/ivar2