More progress on generic histogram implementations