Histogram: minor cleanup