More refactoring of int generators