More plurality fixes.