Some more .string() -> .generic_string() fixes