Mark token type properly