So just to let you know, there is going to be a bunch of these - this is an idiom that we use in a lot of places and they can't be fixed automatically. We could handle this in two steps: Have plural_form output an error (it does now) and then just append + "s" and hope for the best. Then we go through manually and turn each one into `plural_form(UNIT_TEXT, S)` (or maybe just '2' if the number isn't known) or some such. I'm open to suggestions.