In follower branch I have also FOLLOW state on the assisted switch, so I'm not sure if it's good idea to change the name. But maybe it's better to have separate switch for FOLLOW. Also if we will have two switches (EASY and FOLLOW), which should have higher priority? Tree of states will be a bit confusing IMO.

It's time to think how to reimplement modes switches mapping system, but I still have no ideas about this. Maybe you approach will solve the problem, I will look it later in detail.