Hi,
I'll review this probably today, sorry for the delay. I agree that Menelaos' change should go first at it's reviewed already, while the review process is only starting for the variant change.
And don't worry about default strategies. This is a problem that exists with plenty of algorithms and was already solved a consistent way using the staged dispatching approach.
Regards
Bruno