Follow-up for e363b0e4 (Mostly a theoretical fix. On 64bit systems unsigned is 32bit, and we had more than 2^32 units thing would fall apart here.)