The new completion is mostly boilerplate except for the handling of $words/$CURRENT to support specifying the arguments multiple times separated by -n.