Split up 1.8, 2.1 generation tasks.