fixup! allow index definition and primary key constraint to occur anywhere