Some fixes for string interpolation

Long time no see!

Review @paulp @retronym. Also see https://github.com/scala/scala/pull/2282