ReturnStatements - rewrite to use Tokens and fix #487