Remove small casting redundancy