add new ShouldRehash method to factor out common code. Fix the dtor to not