Merge James multi-character id changes.