stylistic cleanup and add FSharpExpr.Type