update typechecker with grammar fixes for conditions