Better way of re-ordering build steps.