Further corrections to string.hpp to make gcc happy