Convert last remaining cases of generating JID manually with utils function