Some cleanup and started work on LiquidConduid.