In preparation for high-resolution scroll wheel support
In order to add high-resolution scroll wheel support (!1962 (merged)) I made some refactor patches.
As suggested by @carlosg, I'm moving the refactor patches to a different MR. See !1962 (comment 1245413).