Refactor matcher handler

The recent indexer handler refactor cleaned up the service initialization a lot. This task is to do a similar refactor to the matcher handler initialization.