Fix up workspaces slightly. (Although still not perfect.)