More String->Int conversions (ones I've missed previously.) Appears I've finally converted all of them. From Finn Bock's patch.