I think it's a bit too hard coded to have things like addSpeakTextSwitchListener. Especially since the presence of these are controlled by the schema. I suppose some of these will go away after the latest Infusion upgrade. Let's take a look again after that.