Better handling of workspace removal.