Rename local variable plus return a bit earlier on edge condition.
Merge pull request #288 from Dmitry-Me/RenameVariablePlusReturnEarly

Rename local variable plus return a bit earlier on edge condition.