Revert "Improve token parsing and better support control operators such as pi…"

This reverts commit eede2aacf64154bf89eacac31a8a5f0cc1e4d968.