Minor cleanup in IdGenerator