Works across both backends, fixes broken mapping on x11, and results in less code.
Closes: #514 (closed)