[#10] Cleaner workaround per discussion on https://issues.scala-lang.org/browse/SI-8357