Make ELSE clause optional.
New tests in ExtrasTest