Extenders complete refactoring

This fixes affinitic #5900