Make '--unified' the default and add '--no-unified'