Split out a complex build step