[cvs-nhc98] patch applied (nhc98): Rejig to order of building from .hc bootstrap files.