No, Jocelyn, it's not an expanded class. It's the class mentioned in https://www2.eiffel.com/support/protected/report.aspx?pr=15773 .