SI-8578 Avoid fresh name clashes under -Ydelambdafy:method

Review by @lrytz