Fixed (hopefully) a problem in remove-token for exists-start/end-node. The code for exists-start-node called remove-token for children of exists-end-node  even, when add-token never was called for the same token. Further, remove-token did not check, whether the token already was removed, because we expected that this would not be possible. There may still be problems with this code