Refactor. Update warcreplay.