fix closures matching according to CorrectWithinSemantics test

Change-Id: I188e499a54063f7ee513007dc91547bbb240aec9