I'd wait for Scala to fix it (or I'd fix it in Scala).