Move key-matching functions into x.c