More fixes for the new plurals scheme.