Remove unneccessary string-copies