Simplify simple return statements.