Leaving only one lambda implementation.
Simplifying tests.
Cosmetic changes.