Missed some ALL_PIECES changes

No functional change