liron's little fixes

[lirona]

• remove redundant check (both checks check that lower bits are 0)
• check that also the tokenID is not a base type in splitting/merging