Remove indirect XkbCM* and XkbSM* macros The XkbKey* macros used to work through XkbCM* and XkbSM* variants, for the xkb_map and xkb_server_map respectively; the latter versions weren't used by anyone at all, so just bin them and make the macros work directly. Signed-off-by: Daniel Stone <daniel@fooishbar.org>