Cleaned up warnings from Scala optimization inliner.  These were caused
by a bug.  See https://issues.scala-lang.org/browse/SI-6723.