Some CASTs were not needed.