Tweaked EpicGenerator a bit.