Avoid superfluous return statements

[skip ci]