ENG-6344: Fix miscounting in -p option.