Handle more cases that are introduced by typechecker.
Handle more cases that are introduced by typechecker.

FStarLang/FStar,FStarLang/FStar,A-Manning/FStar,A-Manning/FStar,A-Manning/FStar,FStarLang/FStar