Fix crash in control flow simplifier when translating corlib (#263)
Merge remote-tracking branch 'upstream/master'