Fix fallout from Joseph's untested Makeconfig change.
Make strtok benchmark competive.

We include a generic version of strtok to result which could be faster
when underlying primitives are better optimized than current version.