split variant into plain and optional, add variant serialization

split variant into plain and optional, add variant serialization #1315