Fix the saving of workspaces and window layouts.

Now to double check sessions...