Added contexts for lambdas and definitons.