Fix consistency of return statements