ReturnStatements - rewrite to use Tokens and fix for #167, #341, #487

ReturnStatements - rewrite to use Tokens and fix for #167, #341, #487
shouldn't you use a backward iteration to avoid the need of bumping the limit ?