Split the make extension task out