Maybe add `makeid: null` as well to speed this up a bit?