scala-mode2 slight changes.