Fix logic when dealing with -a arch.target_arch or -a arch.