Use switch expressions in mdsal-binding-model-ri