The examples are compilable again.