Minor clean up
Prevent possible compiler crash, see https://issues.scala-lang.org/browse/SI-5954