Simplify scan logic.
May guess separator again.