Move some more test-and-consumes over to TryConsumeToken()