In ::EndSwap, dc_ class member was accessed through a function. Access it directly like it is done elsewhere in the class. It is also the only place where it is used, so remove the function in question.