Draft: Convert match options from a dict to a simple class

There's some pycompat.byteskwargs() <--> pycompat.strkwargs() juggling, and removal of an unused pycompat import in here that can be split into a series of prior commits for clarity. But I wanted to do this as a PoC.