Do you want to wait on this to be fixed by Scala, or do you want to work around it for now?