Move simple case earlier and use a continue.