Fix if-problem

Thanks for the tip, Wishbringer.
You've Got Legs (and learn to use them)

Also tightens up the AMORPHOUS bar-passing a bit.