Some progress towards fixing coss-term checkouts.