Fix generation on embedded clauses