Move $thisdone and $retvaldone to $self.