Fix switch linearization (again...)