More working IsToken and HasLoc classes in