clang-format: Split up moveStateToNextToken.

No functional changes intended.