Now using table-driven property checks