scanner: remove code for unused tokens, add EOL, revise TestInit
2 files changed