sage-dev: overhaul branch conversions again, add examples/tests