Treat hyphen '-' as part of word.

With thanks to @Gazler. I was purposely naming things with _ to get
around this issue.