Move towards parameter definitions and mapping. Should have done this from the start.
Drop vineyards.