Yet more Chess960 castling fixes.