- && ( pos.piece_on(relative_square(us, SQ_A1)) == piece_of_color_and_type(them, ROOK)
- || pos.piece_on(relative_square(us, SQ_A1)) == piece_of_color_and_type(them, QUEEN)))
+ && ( pos.piece_on(relative_square(us, SQ_A1)) == make_piece(them, ROOK)
+ || pos.piece_on(relative_square(us, SQ_A1)) == make_piece(them, QUEEN)))