Revert "Avoid marking columns in composite keys unique or primary."

This reverts commit 6e87c03fdb6f908fbaecaab5d673b474bca1a746.