Merge "lambda: Minor capture-variable/liberate-variable clean-up after post-merge reviews."
am: f33ea7911d

* commit 'f33ea7911dadab2e49c4634cb1763f0526047e89':
  lambda: Minor capture-variable/liberate-variable clean-up after post-merge reviews.