One more DispatchGroup optimization - extracting updating via S4 slot to a method, avoiding some branches.