Eliminated a few strlen calls.