Moved integrators into top-level; linlin and histogram normalize now