Remove some strlen()s