Make T8832 operative on 32-bit systems (#8832)

(Also, the 'extra_clean' was unnecessary.)