yr: Clean up input handling.
yr: Clean up input handling.

Former-commit-id: fc5d63903321e14fcabc1b8f6890debfd8df39b6 [formerly acecd7321cafbd06d1a3114a5ab32c94ea21de62]
Former-commit-id: ff7424b9c77d570e5532b693aa504048dcd3606a
torhve/ivar2,torhve/ivar2,haste/ivar2,torhve/ivar2