Last commit broke events.State pickleability