Fix (de)serialization of (Multi)Choice. The method signatures do not represent the type of argument passed around, as far as I can tell.