Gabriel Dos Reis wrote: >PS: The choice of _M_type was unfortunate, but that is a topic >of another time. > Ok ;) My idea would be first committing this clean-up and (in the v7-branch) the big one affecting <algorithm> contributed by Chris, keeping, for now _M_type, thus minimizing conflicts. Then, in a second step, search/replace _M_type/_M_value everywhere. Paolo.