There is no good reason for the CREATE TABLE LIKE INCLUDING COMMENTS code to

have hard-wired knowledge of the rules for naming index columns.  It can
just look at the actual names in the source index, instead.  Do some minor
formatting cleanup too.