Manually correct remaining casts.