v8.3: Fixing #3282 (two bugs in the presence of let-in's in "fix").