Forgot to remove some int casts.