More terrible hacks in Match. Someone should rewrite it.