Swapping unit availability as before doesn't work when units are being trained while their production building loses access to train them. see https://trac.wildfiregames.com/ticket/6888#
I tested all three cases below and they all work.
Note: Tooltip change and price increase as instant conversion is very strong.