Avoid unneded early return