Ok, I'll revert to using plural forms everywhere until there is an upstream solution.