Made lambdas handle block structure correctly