Fix more Swift casting issues.