Refactored. Changed N-to-N+1 to omit plurals-only.