This is another pair of clauses where the work is already done from previous constructs, so this just has to allow them and include tests for them. This patch adds testing, does a few little cleanup bits on the clause checking, and enables these.
