Fixups following removal of touch-event.h