Some cleanup... should unify mouse code further on desktop systems.