Fix serialization of watching non-following keychains