Helps if I actually commit typo fixes..
Fix duplicate variable definition.

    Should really make the compiler error on this..
Clean up C string conversion code a bit.