Miscellaneous pointer events cleanups

Comments welcome.