Are by-name parameters already expanded to Function0 here? If not, we'll might need a similar treatment. In any case, this needs a test.