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