Consistent behavior when adding/removing membership types