Reintroduce ELSE clause

Had a chat with softcoder who explained what was going on. We should now be
almost identical to the original but the compiler specific test has been
removed.