After a `return`, writing (and reading) `break` is not really needed. Let's remove it everywhere (continuing work done in 28754fa2).
