Consistently handle 'self' captures

Commit

4 years ago

Consistently handle 'self' captures (cherry picked from commit 3f5ee47db88fbef32d66e1100a97b683cb57b5e8)