Finally fix two-part locale specs