Simplify some return statements.