Braindead fix for empty else clauses, plus a test for Not.