Upgrade Scala 2.10.4-RC3
Minor clean up