Some cleaning up
WIP. Changing the ifToCase to use toks, not prettyprint