Remove unneeded null checks.
Fix a typo
Add checking for more flow of control statements - the early return might be also an early break/continue/goto.
Add tests.