Try/hygienic desugaring

I took care of the reviewers comments. There's a stray commit here to fix language imports. I was sort of sure I had submitted that before and it got merged in, but it seems that was not the case.