further changes to Cast<_>