Better handling of super constructor calls.

Fixes Scala-IDE #1001749.

Plus some clean up.
Some cleanup of the code.