Cleaned up TabulatedDistribution