Further clean-up.  Removed a dependency between context and dialect, and cleaned up the new feature warnings for Scala.