It is my understanding that "there and back" is one stroke. Numbers IMO are just that, numbers. I usually don't even count, I just go until I decide "that's enough".