Handle "str" case (should finally fix all cases of #18).