WIP: Move Ellipsis check before subclass special case