Better handling of adverbial clauses