In this case you've just restructured a short circuit return as an `if`/`else`. In the past I think we've allowed this in the Spark code. Does the scala style guide specifically forbid them? I agree it's better to avoid them, but unless we prohibit them I don't think it warrants changing old code.