Dropping some else-after-returns. No functional changes intended.