Change ordering of composite key creation.