Reorganize logic in ImapToken.Create(type, builder) for robustness

Reorganize logic in ImapToken.Create(type, builder) for robustness #733