Adjust to possible new demo format.