Pull in the upstream Scala snippet fixes.