libicu: Cleanup and better splitting