Properly capture lambda payloads for all handler types.

Properly capture lambda payloads for all handler types. #3184