Finish de-implicit-selfing everything but the test suite