Updates to macro_sail, collapse.