Not a merge stopper. Do you think it will be useful to refactor the code dealing with the plural suffix into a stand-alone helper function?