Final main changes to support serialisation and rendering of tuple constructs.