Tiny fixup of cast removal