More convergence towards what the Xmodmap does.