Hi,

this tiny PR avoids using explicit arguments that are always evaluated by using lambdas where possible.

Cheers, Christoph