Remove a couple of unnecessary casts that my compiler seems to have taken