EZP-21018: Continued refactoring of input dispatcher in services.yml