Again use pieces() instead of piece_on()

No functional change