update binary version to use 2.10
Refactor the map type class instances.

This removes some inlining warnings (by manually inlining the code) and
also moves conditionals outside of the "inner loops" when possible.