Expand fields for composite keys so they're actually unique