Shorter template parameter names to be more readable in Doxygen.

There was a little troublie with the true return statement

The MapFactories have been removed from the code because
if we use macros then they increases only the complexity.

The pair iterators of the maps are separeted from the maps.

Some macros and comments has been changed.