return value if statements which can be simplified to a single assignment, return or assert statement.

Comment From: poutsma

Merged. Thanks for the PR!