Not really as the Factory below manages both versions of the right hand component, so makes sense to keep the same switch.