Cleanup. Ignore types and kinds.

        Use consistent local var names.
        Assume for now that types and kinds match.
Add nested lambda test case.