Experimental Companion Swap with 'U'

Sometimes the companions both get tamed, which is unintentional. I do
not know what is causing it, as I think I've covered everything with
logical checks. Maybe someone else has insight.