Fix savestates broken by #6493.