Trevor's patch does add unique/primary indexes. This would mean that we have to remove the syntax support for "INCLUDING INDEXES" and just add code to the existing WITH CONSTRAINTs code path from his patch.
Is there something else and hence we have the above TODO?