Remove some strlen()s and copies