Switched to pointers for tokens for reusability reasons.

Also, findHandler() now returns correctly for nested handlers.