Some cleaning up on the WorkspaceObjects ...