remove leftover 2.5 compatibility code
remove double cast (const char*)(char*)
Merge pull request #349 from larsmans/cleanup

Minor cleanup (2.5 compat, mostly)