Further reduce size of struct tree on 32-bit systems