Check against self._remaining_calls, not rem_calls