Switch: make all inputs optional in the General context