Cleanup, plus adjustment to the changes in yz_schema