Remove map insert and lookup utility functions for non-string types
Use std::str new and delete functions for string init and fini functions
Cleanup map functions
You can also use your local clone with git send-email.