Make migrate_usernames() always work.

@urbanape has something in pull request #44, but this one is possibly clearer? Either one will do fine.

Please merge.