Cleanup some of the sluice code, no duplication.