Re-land else-after-returns