Stable comparison of stuff that transits through map.

There are probably more of these in the codebase.  Looks like this happens with the go tip via travis.
Merge pull request #110 from jbeda/test-fix

Stable comparison of stuff that transits through map.