Updating: more work on compiling clauses.