Further workarounds for the same bug in Scala 2.10.2