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

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