Fix #7; make lambdas constant fields