Cleanup and document xio changes.