Also removed a few casts that didn't seem useful.
That may add some warnings, but not on any of my systmes.