Begin to hook in the new preference routines.
Replace ExitToShell()s with abort()s.
Other minor tweaks and changes.