Arrangement: make tokens aware of their type (author=Roman.Shein)