We'll still need something for void-return functions. First stab: https://github.com/scala/scala/commit/0db3f41659ec93f8042ddc83be3a641a9793a250