Fixed saving and loading, which had been broken by other changes I had
made.