Adapted to new S/C handler factories.
Using the new specialisation opportunities.