--singular and --plural arguments

[simonw]

The diffs would be slightly prettier if you could replace the words "row" and "rows" with something nicer.

simonw/sf-tree-history@4eaa0d2