More work on adding workspaces to groups. Re #6199.