Handle optimization of labeled for loops correctly.

Fixes issue 1168.

Independently, also add arities to Tokens instead of hard-coding it in AstValidator. (Other passes may find this useful in the future.)
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=58171311
Merge remote-tracking branch: upstream/master