clean up; define temp token type adaptor.