Correct lambda-case and handle given lets better.