Make loop termination more explicit.
Merge pull request #400 from Dmitry-Me/makeLoopTerminationMoreExplicit2

Make loop termination more explicit. This saves one call to tok->nextArgument()