Cleanup more strcpy

[michaelortmann]

Found by: michaelortmann Patch by: michaelortmann Fixes:

One-line summary: Cleanup more strcpy

Additional description (if needed): Not only cleanup, in one case it could be labeled a fix.

Test cases demonstrating functionality (if applicable): No functional change