tidy and use Scala 2.10 'wrapAsScala|Java' conversions

http://comments.gmane.org/gmane.comp.lang.scala.sips/550