Tweaked default IdGenerator implementation