More tidying of Stockpile.