Match expires behavior in the binary protocol with HTTP. Cleanups.