Yeah, I think that would work.

edit - I think the need for explicit types for each SAM was fixed by https://issues.scala-lang.org/browse/SI-8310