Finish migrating the cpl into the thread structure.