Add missing cases to toScalExp.