Fix serialization of MutablePair. Also provide an interface for easy updating.