Make groups be 64-bits (bug #3351, with mods)