Refactored ExpertExtender

Is this fixing an actual bug?