(My fix to for-loops (21984) did not deal with similar problems in if-let expressions, so those binding shifts stay.)