Merge "Reintroduce complication types."