Add macro_sail stuff.