Change the syntax of casting.
Correct some of the token locations.