Erase type instantiations in desugar
Various if forms should have already been desugared
Booleans for operators and conditionals now checked with normal assertions