Parse: Token consumption modernization and loop de-nesting

Cleanup only.