A bit more consistency for auto_branch