A couple of fixes for cfstr_to_str()

I was reviewing your code and found some simple fixes.