Remove dependence on underscore. Fixes #173

We discussed this being a 3.0 change, but it seemed simple enough.