There are a few problem rows still in the user and host tables. I have backups and will restore those individual rows in the morning. Looks to have affected about 2000 rows from 3.5Million. It might mean that some users appear as new if there is new xml exports prior to me restoring, which is not a huge deal.