Updated the way commodity scoping works - now needs aliasing changes in
CommodityType and some updates to the prepop stuff.