integrator/integrator: various API inconsistencies fixed