Get calls to reset() into the right places.