ReturnStatements - rewrite to use Tokens and fix for #167, #341, #487
bug #488 ReturnStatements - rewrite to use Tokens and fix for #167, #341, #487 (keradus)

This PR was merged into the 1.0.x-dev branch.

Discussion
----------

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

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

Commits
-------

8897fce ReturnStatements - rewrite to use Tokens and fix for #167, #341, #487
Trait use statements should not be mixed with imports