scan: Get rid of scan token types in favor of new scan result state.