Deal with spinor-flip issue in alignment... again...