more throttling-related refactoring