Added more explicit str sets.