Remove more string copies
Bring code in line with similar code-paths