Improve extraction of whole-spreadsheet variables.
Handle GammaDistributions properly.