Some cleanup, toward a merge that can compile!