Removes more implicit casts