logging refactor

- make all geocode impls share a trait that unifies some of the logging and gives it a common prefix
- change all dashes to underscores
Revert "Preserve original token punctation."

This reverts commit 3791004e0112e47eb8d037ff97e84198aa905627.