Second attempt at pluralised date cleanup