Log Message:
This needs plural support.  Fixes PR pkg/31816 by Leonard Schmidt.
We ought to make this feature automatic to avoid these problems in the
future...