Collapse away some self->valid tests.