Make PersistentLinkerState fields strict; fixes #4208