Removed indirect dependencies.
Moved things around, cleanup.
Use multicursor preferences everywhere.