Fix repeated and optional fields in constructor arguments.