P.S. Should x_clear_window_mouse_face instead be renamed to clear_window_mouse_face since it doesn't depend on HAVE_WINDOW_SYSTEM like the others do?