Was reminded by #6055, it might be just that simple, to move the ids to the botom of the respective lists.  I THOUGHT we were auto-converting or something.  I'll take a look at shifting them around and merging tonight.