Ported 'ConvertReturnStatementToIfAction'.
Merge pull request #440 from TheCommieDuck/return-to-if

Ported 'ConvertReturnStatementToIfAction'.