Rearrange CreateMatchRequestHandler a bit