OK, for real this time, auto-splitting branches