nits and fix.

- Use defsplitter and split_word.
- fix key comparison of string_match