Remove -A and incorporate that into -a as a new option, -c.
So -a -c will behave like the former -A now.