remove list instances of ToK
complete syntax parser, various changes to make them agree on syntax