I already did a lot of work at the pass for removing <code>else</code> because already return early, see #3286