Preparation for implementing CREATE UNIQUE in the experimental parser

Preparation for implementing CREATE UNIQUE in the experimental parser and merging in 2.0