Slow removal of Proto structures, adding better CLOS handling.