clean up tokenlist

* also introduced @{ token: RUN_BLOCK