Fix include guards.
Add an extended lambda mechanism.