Dominic: simplify deserialisation