Slowly cleaning up use of char * v string...